Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade VS syncd to Bookworm #18347

Merged
merged 3 commits into from
Apr 22, 2024
Merged

Conversation

saiarcot895
Copy link
Contributor

@saiarcot895 saiarcot895 commented Mar 12, 2024

Why I did it

As part of this, iproute2 is no longer compiled here, since the macsec patch is now in version 6.1. In addition, for docker-sonic-vs, version 6.1 of iproute2 is pulled from the bullseye-backports repo.

This PR also includes a sonic-sairedis submodule update. That submodule update needs to go with this PR because sonic-net/sonic-sairedis#1368 adds compatibility for the version of iproute2 that is in Bookworm, but breaks compatibility for the version of iproute2 (with our patches) that is in Bullseye. This means that the regular automated submodule update for that submodule will fail, since it will run tests on the master branch syncd container that is still on Bullseye.

The following commits are included as part of the submodule update:

73ada8d5 Fix SSCI parameter when creating MACsec tunnels on Bookworm (sonic-net/sonic-sairedis#1372)
c41a0cb9 SAI submodule update to bring saithrift changes for syncd bookworm (sonic-net/sonic-sairedis#1370)
be47489f Add Bookworm build to PR checks (sonic-net/sonic-sairedis#1371)
d9ba01b5 Update ip commands for MACsec for Bookworm (sonic-net/sonic-sairedis#1368)

Depends on sonic-net/sonic-sairedis#1368, sonic-net/sonic-sairedis#1372, and sonic-net/sonic-mgmt#1228.

Work item tracking
  • Microsoft ADO (number only):

How I did it

How to verify it

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205
  • 202211
  • 202305

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

@saiarcot895
Copy link
Contributor Author

/azpw run Azure.sonic-buildimage

@mssonicbld
Copy link
Collaborator

/AzurePipelines run Azure.sonic-buildimage

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

As part of this, iproute2 is no longer compiled here, since the
macsec patch is now in version 6.1. In addition, for docker-sonic-vs,
version 6.1 of iproute2 is pulled from the bullseye-backports repo.

Signed-off-by: Saikrishna Arcot <[email protected]>
Signed-off-by: Saikrishna Arcot <[email protected]>
prsunny
prsunny previously approved these changes Apr 10, 2024
This submodule update needs to go as part of this change because it
would break compatibility with Bullseye for MACsec, but adds
compatibility for Bookworm, which is what is needed here.

This brings in the following commits:

```
73ada8d5 Fix SSCI parameter when creating MACsec tunnels on Bookworm (sonic-net/sonic-sairedis#1372)
c41a0cb9 SAI submodule update to bring saithrift changes for syncd bookworm (sonic-net/sonic-sairedis#1370)
be47489f Add Bookworm build to PR checks (sonic-net/sonic-sairedis#1371)
d9ba01b5 Update ip commands for MACsec for Bookworm (sonic-net/sonic-sairedis#1368)
```

Signed-off-by: Saikrishna Arcot <[email protected]>
@yxieca yxieca merged commit e15a1aa into sonic-net:master Apr 22, 2024
19 checks passed
@saiarcot895 saiarcot895 deleted the bookworm-syncd-vs branch April 23, 2024 22:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants